Merge remote-tracking branch 'savannah/master' into HEAD

diff --cc etc/NEWS
Simple merge

diff --cc lisp/emacs-lisp/advice.el
Simple merge

diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge

diff --cc lisp/loadup.el
Simple merge

diff --cc lisp/mail/emacsbug.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc lisp/term/w32-win.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc test/lisp/subr-tests.el
Simple merge